Code before merge.
Merge branch 'master' of https://github.com/andrew749/Hive

Conflicts:
	Hive/app/src/main/java/com/yhacks2014/hive/HiveMain.java
	Hive/app/src/main/res/layout/maincard.xml
Merge branch 'master' of https://github.com/andrew749/Hive
Working with backend server. Now gets data from heroku and displays.