Merge remote-tracking branch 'origin/ajbranch' into ccbranch
Added a line to AJ's profile page
Still playing with iframes
Moved the footer to below the body tag
Merge remote-tracking branch 'origin/ajbranch' into ccbranch

Conflicts:
	GuardianStrap/kit/profile.kit
	GuardianStrap/profile.html
UH OH
Removed my comments from AJ's files
Merge pull request #16 from mr-mr/ccbranch

Still playing with iFrames, getting the height to be auto and not fudge it.