Trying controllers
Added CT controllers
Resolved conflicts
Cleaned app js file
Modified Splash Page
Added Register html outside of SPA
Removed outdated login.php file
new message layout
Fixed broken link on logout
Merge branch 'James'
Merge remote-tracking branch 'origin/annes_branch'
Merge branch 'master' of github.com:rugbyprof/Aii
Implemented dummy db queries
fixed controller stuff
Fixing Sanan's junk...
Merge remote-tracking branch 'origin/master' into annes_branch