final changes
updated selects
Merge branch 'master' into gh-pages

Conflicts:
	assets/img/background.jpg
	index.html