About page template!
It took forever, BUT I FIGURED OUT HOW TO DISPLAY RECURRING DAYS OF THE WEEK!

That was hell.
Fixing up the events list!
finished the top half of the about page
So close, yet so far.

Trying to list the categories.
STRIP TAGS FTW.

Ok, Good night.
Quick CSS

now bed for real.
Merge branch 'refs/heads/catt' into nina
Beginning the "about our classes" portion

Yey
merging nina and about-page branches take two
got the authors code to work yay and styling is mostly done
started contact page
contact form is now working and styled yay
Almost done with the home page, then gonna do responsive!
Finished all the dirtywork!
Merge remote-tracking branch 'origin/nina' into catt

Conflicts:
	library/css/ie.css
	library/css/style.css
Integrating nina's stuff
Merged stuff, fixed stuff!

Yay! Now for the events page and then things can go up!
Will fix more later

mergh
Events & classes going up

Then I'll work on integrating the contact page!