Updates
Merge branch 'master' of https://github.com/isunkes/simulator

Conflicts:
	styles.css