version final
Merge branch 'master' of https://github.com/rsanabria/ediscretas

Conflicts:
	public/stylesheets/general.css