fixes travis file
requiring users.js
Merge branch 'master' of https://github.com/pocket-gophers-2014/zombify
Merging
merging new seed data
adds rake task
fixing view
fixes merge conflicts with users/index
Merge pull request #23 from pocket-gophers-2014/RakeFile

Rake file