Merge pull request #3 from Solonarv/solonarv

Fixed my git setup and added stuff
Merge pull request #4 from Solonarv/master

Fix it