aaaaaaaaaaaaaaaa
Merge branch 'master' of https://github.com/bpicolo/Yample

Conflicts:
	public/javascripts/main.js