Commiting a bunch of crap
Merge branch 'master' of https://github.com/gunnar94/Maverick