Initial commit
Client/Server skeleton classes added, gen files pushed
inital
Updated Server/Client classes
Updated Client/Server classes, renamed main package
Updated again
Updated Client/Server/MainActivity classes
Update ip address in MainActivity
Modified MainActivity ip address
Update Client/Server/MainActivity for internet access
Updated Server/Client networking
Changed port numbers in MainActivity
Created buttons for the MainActivity class:
connect to client button,
connect to Server button,
and help button.

Created HelpActivity class and associated XML file.
splash screen setup
Merge branch 'master' of https://github.com/ProjPossibility/2014-CSUN-CareTaker-2

Conflicts:
	gen/com/example/deadreckoning/R.java
	src/com/example/deadreckoning/MainActivity.java
Added BroadcastReceiver, changed MainActivity
Added BroadcastReceiver
merging
Merge branch 'master' of https://github.com/ProjPossibility/2014-CSUN-CareTaker-2

Conflicts:
	gen/com/example/deadreckoning/R.java
Updated WiFiDirectBroadcastReceiver, Client and MainActivity to allow for direct WiFi access