Add Server Connectivity
Merge branch 'master' of https://github.com/Pancia/hackathon

Conflicts:
	hackathon.iml
	src/main/AndroidManifest.xml
	src/main/java/com/turingsarmy/hackathon/MainActivity.java
Merge branch 'master' of https://github.com/Pancia/hackathon

Conflicts:
	hackathon.iml
	src/main/AndroidManifest.xml
	src/main/java/com/turingsarmy/hackathon/MainActivity.java
	src/main/res/layout/activity_main.xml