Merge branch 'master' of https://github.com/UMSeniorProject/StockSign

Conflicts:
src/com/seniorproject/stocksign/activity/MainActivity.java
Resolved Main Activity Conflicts