amigrations
Merge branch 'master' of https://github.com/HammockHackers/iCollaborate into nate
db settings
migrations
ignore further db changes
Merge branch 'nate' of https://github.com/HammockHackers/iCollaborate into nate