Merge branch 'master' of https://github.com/evanmac123/shredcast

Conflicts:
	css/style.css
	evanselection_test.html
idk

idk