updated .gitignore for figaro
Merge branch 'master' of github.com:mkmizuta/pea-patch-planner
merge with master
merged
Merge branch 'master' of github.com:mkmizuta/pea-patch-planner into tool_checkout
Tools has_many through set up with tests for association and validating tools_users
Map out the tools_users_controller specs
Merge branch 'master' of github.com:mkmizuta/pea-patch-planner into tool_checkout
Can create an association between a tool and the user checking it out
logs and current_checkouts working, patch update not working, committing to switch branches
fixed merge conflict
ToolsUsers objects can now be checked back in in the backend, with specs passing.
Current status of tools. In process of working on views
Merge pull request #32 from mkmizuta/s_weekend

S weekend
awesome background added
Add forms and connections to views for Tool functionality.
Fixed merge conflicts
Forgot to run migrations before pull request
Progress made on tool checkout availability, also fixed a bug with tool deletion
logs available for admins