messed it up
Merge branch 'master' of github.com:BrianJakovich/sample_app

Conflicts:
	Rakefile