resolves conflicts
resolves conflicts
resotres test suite
adds controller specs for basic CDUD app funtionality
fixed conflicts