Untrackified .project
Merge branch 'master' of github.com:WehtamP/370project