Changed titles
Merge remote-tracking branch 'origin/master'

Conflicts:
	download.html
changed title
Merge branch 'master' of https://github.com/pellejacobs/Pennapps-Fall-2014