added more things
Merge branch 'master' of github.com:Stergeron/global.hackathon