no directory separator caused a 404 error
Uncommitted .gitignore was pissing me off
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	install/views/complete.php
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #277 from mLupine/dev

no directory separator caused a 404 error