Fixed that shit out of that
Merge branch 'master' of github.com:bDino/IS2014