Removed .user file
Merge branch 'master' of github.com:eriktalvi/cs372-FinalProject