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
Convert tabs to spaces
Finished logic for intro page and adding dashboard to system
Added Dashboard add logic -- finished
Fixed accidental merge conflict -- shouldn't code late at night
Added asset files and delete image to the project
Fixed style issues in modal forms
Fixed style issues in modal forms, added intro.html into the mix
Removed console logs in intro js and fixed a null problem with object toString()
Fixing things to make sure add.js works at a later date -- broken at the moment for rebase
Removing client dir
Flattening assets
Finalise asset re-arrangement
Fixed html files with changed paths.  Renamed index to dashboard for proper navigation