Added stuff
Merge branch 'master' of https://github.com/Voltzz/massive-octo-ironman

merging files