added Mike and Peggy's repo
added Mike and Evan's link
Merge branch 'master' of github.com:mikekauffman/march2014ProjectUrls

Conflicts:
	SinatraSpike.md
Update TestedSinatra.md

Adding Peggy's url
Update TestedSinatra.md
Update TestedSinatra.md
Add file for URL shortener
fixing merge errors