restore files
Merge branch 'master' of https://github.com/schifano/redbirdhacks

Conflicts:
	.DS_Store
	index.html