removed ~ file
Removed extra file telling to switch to dev
Merge pull request #2 from stuycs-softdev/dev

Dev
Merge pull request #3 from stuycs-softdev/chris

Removed extra switch to dev file
Merge pull request #4 from stuycs-softdev/chris

Chris