Added join page stuff.
Recommiting for fun.
Resolved conflicts.
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts
Theme 0.6
Cropped some of the images on the Facilities > Eagle Lake Observatory page.
Finished the member joining page.
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts
Merge branch 'master' into feature-cg

Conflicts:
	wp-content/themes/flat-theme/mas.css