Merge branch 'master' of https://github.com/ygayl/amg

Conflicts:
	app/views/main.html
Merge remote-tracking branch 'origin/master'