Missing development files
Merge branch 'master' of github.com:MatthewWaite/RiverSee

Conflicts:
	riversee/.DS_Store
	riversee/upload/.DS_Store
	riversee/upload/templates/.DS_Store
Removed Pycharm files