Joshua's commit :D
Merge branch 'master' of https://github.com/MrGrinst/gitdemo
merged crap
Merge branch 'master' of https://github.com/MrGrinst/gitdemo
merging more crap