Design verbeterd!
Merge branch 'master' of github.com:GRAAFYME/SubscribeMeP4P

Conflicts:
	SubscribeMe/application/controllers/upload.php
	SubscribeMe/css/main.css