added links
Merge branch 'master' of github.com:pellejacobs/Pennapps-Fall-2014
added search
Merge branch 'master' of github.com:pellejacobs/Pennapps-Fall-2014

Conflicts:
	index.html