Application.ini
Merge branch 'master' of https://github.com/droopram/HackNSlash

Conflicts:
	mijnid/application/configs/application.ini