push all the stuff I forgot...
Merge branch 'master' of github.com:Berserker88/inr-p1