remove DS_store
check-in after team model added
setup
check-in before slight cleanout
check-in before master merge