initial distribution commit
Merge branch 'master' of https://github.com/whytheplatypus/SecureChat
Merge branch 'gh-pages' of https://github.com/whytheplatypus/SecureChat

Conflicts:
	.gitignore
	.htaccess
	font/FontAwesome.otf
	font/fontawesome-webfont.eot
	font/fontawesome-webfont.svg
	font/fontawesome-webfont.ttf
	font/fontawesome-webfont.woff
	scripts/alert.js
	scripts/app.js
	scripts/main.js
	styles/bootstrap.css
	styles/font-awesome.css
	styles/main.css
ok i think this gh-pages thing will work now