added spec and gem file lock
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
template update
Merge branch 'master' of github.com:rawerner/hacknashville
added spork, guard, rspec
added spec and gem file lock
added spork, guard, rspec
Merge branch 'master' of https://github.com/MorleyB/hacknashville into feature/rspec_guard_spork
Merge branch 'feature/rspec_guard_spork' of https://github.com/MorleyB/hacknashville into feature/rspec_guard_spork
Merge pull request #6 from Ashley-Wright/feature/Mentee

Feature/mentee
Merge pull request #7 from MorleyB/feature/rspec_guard_spork

Feature/rspec guard spork
Created admin model
No changes to these files
Merge pull request #8 from deewilcox/admin-model

Admin model
Fix schema conflict