merge
Merge branch 'terristoires' of https://github.com/corehacker07/Hyblab2014 into terristoires