test of blue branch
red stuff added
Merge branch 'red'

Conflicts:
	readme.txt

mergeing red branch
added more blue stuff
fixed merge conflicts