gitignore updated
Makefile fun
Merge branch 'master' of github.com:SneManden/MJC2014