Fixed htaccess
Fixed conflicts
Fixed conflicts
Merge branch 'firebase' of https://github.com/sjg/SchoolDashboard into firebase
Changed the htaccess for the final server - not actve at the moment