changed index page
sorted merge conflict - hopefully
controller
still finding problem. Included in index.html file