no message
Added Cookie Support
Merge branch 'master' of https://github.com/ohearnk/CS467

Conflicts:
	.gitignore
	source/android/HomeAutomation/src/com/example/homeautomation/MainActivity.java