Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en

diff --cc tmpl/skel.en
index 0fc3aa4fa3c99edd1ab00f1cbed936ff26913974,fce6bd89d338606c8a91e52b86f4a6fa7c757c9f..8c6460c86e2297c98f7d0ee1ed79bd01c1737e55
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -37,10 -36,9 +37,10 @@@
  <div id="content">Content goes here</div>
  
  <div id="login" class="hidden"><a href="/login">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
  <div id="tracker" class="hidden">
- <h1>Track user</h1>
+ <h3>Track user</h3>
  <div id="tracker_form">
  <div class="form-group">
  <label for="tracker_username">Username</label>