Merge pull request #30 from MarwanNakhaleh/develop

file upload stuff; controller, view, model, everything... hopefully this...
Merge pull request #40 from Icarurs/develop

Make navbar #222 and edit the sign in page
Make navbar #222 and edit the sign in page
Only show the background on the home page
Make the default background super light gray
Merge pull request #41 from Icarurs/develop

Only show the background on the home page
Merge remote-tracking branch 'upstream/develop' into develop

grab
update names with devise