clean some stuff!
Merge branch 'master' of github.com:freuk/internship