tyler tried
githubisdumb
Merge branch 'master' of https://github.com/sudden62/TwitPic

Conflicts:
	results.html