i dont care about the /bin folder
meuk
mergeconflict incomming!
Merge branch 'master' of https://github.com/willemhustinx/DP2