bug fixed
merge
Merge branch 'master' of https://github.com/loclamor/nuit2013