Added some additional controllers and modified the index.html file
merge conflicts addressed