Removed Links to {config,controller}.php in resources/
Another Removal of Stupid Link
Yeah, deleting links
Fixing Another Netbeans Stupid Overwrite
Fixing Netbeans
Merge branch 'master' into sessions

Conflicts:
	config.php
	controller.php
	index.php

Sync sessions with the master