merged
Merge branch 'master' of https://github.com/Therrien-Barley/cowboy

Conflicts:
	eg/app.js