added first stuff
added more fun stuff
Merge branch 'master' of github.com:4lbertoC/shuriken