Generated scaffolds
Scaffolding completed
Added main to template
Changed name of main controller
Removed an extra space
Displaying the proper main template
Modified the controllers in app and index
Merge branch 'master' of https://github.com/stuartstein/old-salt-angular