fixing controllers
Merge branch 'master' of https://github.com/MPMoughan/appseller

Conflicts:
	config/routes.rb
workings on the models
Merge pull request #5 from bamiano/master

fixing controllers