Some cool updates
Some cool updates

Conflicts:
	index.html
	styles/default.css