Resolved AisleViewActivity
Resolved aisle_view.xml
Merge branch 'master' of
https://github.com/natrajkaushik/nutri-ninja.git

Conflicts:
	NutriNinja/res/layout/aisle_view.xml
	NutriNinja/src/com/doe/nutrininja/AisleViewActivity.java