updated index and deleted coffeescript
Merge branch 'master' of github.com:codeanpeace/project-x into zara
updated routes, controllers, and views