updated readme
IP address change
Conflict resolution
webcam.fla weirdness
merging

Merge branch 'master' of github.com:lazarentertainment/yanked-modules
re-introducing git ignore for java binaries
more merging issues