Initial Commit
Removed django
Removed .DS_Store
Missed updates
Merge branch 'master' of https://github.com/SwampCo/Observatory

Conflicts:
	.vagrant/machines/default/virtualbox/id
Merge branch 'master' of https://github.com/SwampCo/Observatory
removed old directories