This is not the commit you are looking for
Merge branch 'master' of https://github.com/Richardsanchez/Cocaine
This is not a commit
Merge branch 'master' of https://github.com/Richardsanchez/Cocaine

Conflicts:
	js/app.js