Merge pull request #1 from KiwiStrongis/master

pull dude
Merge pull request #2 from KiwiStrongis/master

asdf
aslfdsakj
fixed files