Added join page stuff.
Recommiting for fun.
Resolved conflicts.
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts
Finished the member joining page.
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts