clean up merge issues, remove user/password index
fix user auth merge issues
clean merge headers from rspec files
Merge branch 'master' of https://github.com/rnachison/BTR-FoodTrucks
Merge pull request #1 from rnachison/brian

Added schedules and locations migrations
Merge branch 'master' of https://github.com/rnachison/BTR-FoodTrucks
add homepage link to foodtruck index
first commit
pull from master
get map to load after logout
foodtruck CRUD
migrated dev environment
merge with brian branch/bootstrap installed
merge rebecca branch
merged
merge brian
merge brian
tmp/dev log updated
merge with brian branch
Merge branch 'master' of https://github.com/rnachison/BTR-FoodTrucks