Added Wifi stuff
Added Wifi stuff
Added Wifi stuff
Merge branch 'master' of https://github.com/mbartling/Cal

Conflicts:
	app/src/main/java/com/example/michael/cal/MainActivity.java