updated controllers, models, views, and javascript to get editors working
resolving conflicts
fixing commits
added comments
Merge pull request #24 from stevenmiller888/master

updated controllers, models, views, and javascript to get editors working