changed makefile
Merge branch 'master' of github.com:laochailan/pgp1-ws1415
Folien in Einzeldateien verschoben
Merge branch 'master' of github.com:laochailan/pgp1-ws1415