Merge branch 'master' into dev
Squashed commit of the following:

commit 82b073b404b234bfdf2c4807fcad290e868b5bdf
Author: Chris King <chris.king@xamarin.com>
Date:   Sat Oct 19 19:34:38 2013 -0700

    josh's second edit in master branch

commit eda8a448136ae758260dd0cae7d29b99bf99ed36
Author: Chris King <chris.king@xamarin.com>
Date:   Sat Oct 19 19:34:07 2013 -0700

    josh's first edit it master branch
chris makes a change to dev
Merge branch 'dev' of github.com:kingces95/test into dev

Conflicts:
	readme.txt
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	readme.txt
Merge branch 'dev' of github.com:kingces95/test into dev
chris makes a change to dev branch
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Conflicts:
	readme.txt
cherry.txt feature complete
cherry.txt feature ready for release