Merge pull request #3 from PabloRomanH/master

many changes
updated TODO
landing page
Merge pull request #1 from tonipenya/master

landing page
Merge branch 'master' of https://github.com/babelboo/babelboo-app

Conflicts:
	public/js/mayhem.js