grabbed annolax's changes
Merge branch 'master' of https://github.com/Annoa/WorkshopWA
workshop 2 done, problem with cleaning prj