Adds devise, rspec, guard and spork
Adds User model and controller
Merge branch 'master' of github.com:Felttrip/octo-wookie

Conflicts:
	Gemfile.lock