minor changes
Merge branch 'master' of github.com:AndrewMohawk/zaconv

Conflicts:
	badgeCode/src/badge.ino
Merge branch 'master' of github.com:AndrewMohawk/zaconv
Merge remote-tracking branch 'ruby/master'
Merge remote-tracking branch 'ruby/master'
Merge branch 'master' of ruby.runawaycoder.co.za:/home/rc1140/dev/zaconv
removed swap file
Merge branch 'master' of ruby.runawaycoder.co.za:/home/rc1140/dev/zaconv
Major changup
Added util files and come cleanups
Merge branch 'master' of ruby.runawaycoder.co.za:/home/rc1140/dev/zaconv
Merge branch 'master' of 10.0.0.5:/home/rc1140/dev/zaconv
Added multi line support
Merge remote-tracking branch 'origin/master' into apull

Conflicts:
	badgeCode/src/combined/combined.ino
Added saved message , fixed memory corruption and changed the badgeNick to run over 3 lines