equipment REST API minus user_id ref
minor bootstrapping
Merge branch 'master' into vivek
Merge pull request #19 from vivekmshah/james

add styling to results page
app view template minor fix
Merge branch 'master' of https://github.com/vivekmshah/moochify
Merge branch 'master' into vivek
fix header bar formatting
styling & orders controller
Merge pull request #20 from vivekmshah/james

James
resolve merge conflicts on index and edit equipment view templates
equipment avatar image using paperclip
remove test images used for paperclip implementation
add settings route to masthead menu
Merge pull request #21 from vivekmshah/vivek

Paperclip integration
user profile photo using paperclip + bug fixes
Merge branch 'master' into vivek
style updates to make room for photo fields