Initial Commit
Grant initial commit, add bootstrap
Update git ignore
Merge branch 'gh-pages'

Conflicts:
	.gitignore
	app/app.css
	app/index.html
	bower.json