Trying controllers
Added CT controllers
Resolved conflicts
Cleaned app js file
Merge branch 'master' of github.com:rugbyprof/Aii
Implemented dummy db queries
fixed controller stuff