need to commit before i can pull
Merge branch 'master' of https://github.com/dsypien/Euler

Conflicts:
	js/index.html