Merge branch 'master' of https://github.com/abhimskywalker/app_files

Conflicts:
	app/js/controllers.js
Resolved Conflict