testing-austin
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/hackduke2014/stork/Stork_Main.java
testing-austin