Backing up due to losing .git folder to Dropbox stupidity :(
Merge branch 'master' of https://github.com/paulbrzeski/Langenium

Conflicts:
	public/website/styles/home.css
	public/website/styles/home.styl
	updateServer.sh
	views/website/home.jade