Changed some stuff
Merge branch 'master' of https://github.com/GuardiansofSunshine/ALF2

Conflicts:
	FollowThePrius.html
ftp