Pro Works!
Merge branch 'master' of https://github.com/stayradiated/Nitro

Conflicts:
	public/application.js