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

Conflicts:
	public/javascripts/YampleManager.js
	public/stylesheets/style.css