Merge pull request #1 from cxy1796/master

new css
More consistent Config file
added bootstrap, added default search text
A start to admin panel and database driven stuff
Lesson admin page more polished. Auto generated nested content on Lessons content page, pulled from DB
Admin panel now fully works for adding Lessons! Yay!
Merge branch 'databaseStuff'

Conflicts:
	includes/sections/content/lessons.php
	static/css/main.css

Also forced the legacy URL generation to use the more flexible Config file. Hopefully we can stop overwriting each other so much now.
Good debugging point if I ever need to again
Lessons 100% automated. Side nav now auto generates from h3 tags. Previous/Next links auto generate.
Added admin panel and fully operational database driven content pages for Activities.
Merge remote-tracking branch 'cathleen/master'

Conflicts:
	includes/Page.php
	includes/config.php
	includes/sections/content/home.php
	includes/sections/content/lessons.php
	index.php
	static/css/homepage.css
	static/css/main.css
config
Merge remote-tracking branch 'sid/master'