First commit
Merge branch 'master' of github.com:uslide/app

Conflicts:
	css/style.css
Various stuff added to homepage