table styles
navbar
color changes
colors
buttons
merged Merge branch 'master' of https://github.com/Musicophilia/hackathon

Conflicts:
	index.html
	lost.html