Menu options layout
Merge branch 'master' of https://github.com/mnitchie/MobileGroupProjects

Conflicts:
	FirstNXTProject/AndroidManifest.xml
	FirstNXTProject/res/menu/main.xml
	FirstNXTProject/src/nitchie/arruda/gurnee/chiluka/firstnxtproject/MainActivity.java
Merge branch 'master' of https://github.com/mnitchie/MobileGroupProjects

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
check 1
check
check2
Final
final