Merge pull request #2 from AlexZerr/sterling_work

Finally... Merged?
Fixed pictures (_form partial) after merge
 I hope it works gemfile bump
Merge branch 'master' of github.com:AlexZerr/bonediva
stupid fing database file
Deleted some photos from public/uploads
Merge branch 'master' of github.com:AlexZerr/bonediva
Add uploads and DS_Store to gitignore
Minor cleanup
Merge branch 'master' of github.com:AlexZerr/bonediva
Merge branch 'master' of github.com:AlexZerr/bonediva into sterling_work
Cleanups, top_bar restyling attemept, add users list page