Changes to .DS_store
Merge branch 'dev_matt' of https://github.com/mattcano/PillBox into dev_matt
Added .DS_Store to .gitignore and removed existing .DS_Store file.
Merge branch 'dev' into dev_matt

Merging dev into dev_matt with D's backend changes.
Merge branch 'dev' into dev_matt
Added database file to .gitignore. Added bootstrap javascript to application.js.