test3
Merge branch 'master' of github.com:ddarren/pindea

Conflicts:
	README.md

Signed-off-by: Darren Smith <ddarrensmith@gmail.com>

resolving merge conflict in readme