Pulling
Merge branch 'master' of https://github.com/ajd394/libzforfriends

Conflicts:
	registration.html
Merge branch 'master' of https://github.com/ajd394/libzforfriends
Merge branch 'master' of https://github.com/ajd394/libzforfriends
Some stuff