.gitignore changed to mirror upstream
error
Merge pull request #36 from jgregorynoctrl/master

delete ds_store file
fixed .gitignore differences between upstream and local
updated database to remove last_user
Merge pull request #37 from JohnCannonIT/master

Updated database to remove last_user
ER diagram updated 2/28
Merge pull request #38 from JohnCannonIT/master

ER diagram updated 2/28
fixed a merge conflict, not sure why it occurred