updating
using theirs
Merge branch 'master' of github.com:TeamTriangular/Triangular
removing .userprefs and updating gitignore file
Merge pull request #14 from wroy/master

revmoing .userprefs file, updating gitignore