uu
Merge branch 'master' of https://github.com/polarbeardesign/icejam2014

Conflicts:
	.DS_Store
adding gitignore
final edits to ip listener - passed testing