Comment out require faker to test heroku deployment
Update homepage styling with locker background, header, login forms
Rectify Merge Conflicts
Merge pull request #21 from gopher-snakes-2014/Homepage_Styling

Homepage styling
css changes
fixes merge conflicts