asdfasd
Merge branch 'master' of github.com:apontecolina/Hackaton

Conflicts:
	public/js/main.js
fasfsd
Merge branch 'master' of github.com:apontecolina/Hackaton