cleaned up css files and deleted empty file users.css.scss
cleaned up css files and deleted empty file users.css.scss
resolved merge conflicts
Merge remote-tracking branch 'origin/master'
Merge pull request #64 from fence-lizards-2014/heroku-test

Heroku test