some
la till en till punkt
Merge remote-tracking branch 'origin/master' into htaccessFix
app
encryptionkey
still working on htaccess
fixade temp startsida / route
fuck this / rollback
Merge branch 'master' of https://github.com/vu4you/vu4you

Conflicts:
	app/views/startpage.php
conflict boxshadow fixed
fixed routes in htaccess
Merge remote-tracking branch 'origin/htaccessFix'
Merge branch 'master' of https://github.com/vu4you/vu4you
Merge remote-tracking branch 'origin/htaccessFix'
last fix

Added old htaccess and an outer rewrite to  point att public folder with
its default rewrite
Merge remote-tracking branch 'origin/htaccessFix'