Gemfile.lock
Gemfile.lock again
Merge branch 'master' of github.com:localmotion/web
Get rid of whiny mass-assignment warnings'
'
Static Pages controller and beginning of bourbon stuff
Merge
Merge conflicts
Update gemfile with standard rails 4 gems'
Remove unused stylesheets and rename current ones appropriately
Merge pull request #7 from nickbender/master

Clean up unused stuff, make stylesheets sassified to eliminate double slug copiling, Make rails configs less whiny.