updated ruby version
merged with upstream/master
Merge pull request #5 from maebeale/master

admins & students controllers + routes
Add student and admin controller specs
Adjust login/logout with devise
Add .travis.yml
Adjust .travis.yml
Add sessions controller spec
Merge master
Changed version of Bourbon and Neat
Merge remote-tracking branch 'upstream/master'
Modify travis file
Merge branch 'tylerberry4-master'
Update gitignore
Remove coverage from git
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'