Merge branch 'master' of https://github.com/TomMurray/FWNAA
Renamed registerform.html and loginform.html