playing around
playing around more
Merge remote-tracking branch 'origin/ishita'

Conflicts:
	css/starter-template.css
	index.html
Merged ishita's changes with master, minor fixes on the navbar button