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

Conflicts:
	NutriNinja/res/layout/aisle_view.xml
Resolved(?)
Merge branch 'master' of
https://github.com/natrajkaushik/nutri-ninja.git

Conflicts:
	NutriNinja/src/com/doe/nutrininja/AisleViewActivity.java
* Added compass switching logic
* Fixed size of brand list items
* Added dynamic text size for brand list items