shit stuff
merge
Merge branch 'master' of git://github.com/kapv89/random-stuff