Merge branch 'test2' into gh-pages

Conflicts:
	app/views/main.html