equipment REST API minus user_id ref
minor bootstrapping
Merge branch 'master' into vivek
Merge branch 'master' into vivek
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