stuff
reset
Merge pull request #3 from Patcraft/dev

merge Dev into master