edited some files for the funz
Merge branch 'master' of https://github.com/invad0r/project1