Merge branch 'master' of https://github.com/MayaLekova/hackfmi2013

Conflicts:
	js/main.js