yoyo
Merge branch 'master' of github.com:calvinmm/hack-rice-2014

Conflicts:
	site/signin.html
resolving changes