changes
AA
Merge branch 'master' of https://github.com/sumitarora/bigu

Conflicts:
	app/js/controllers.js
	dist/jshint.xml
added unused folder to ignore