updated app.factory
carousel update
updated app.factory
Merge branch 'master' of https://github.com/prakashgbid/www

Conflicts:
	js/controllers.js
	partials/welcome.html