added michelle's static pages for her
updates working with steve and sean
almost done with app style
Merge commit 'f6e0c45389ddae70dc5eb08e4543bcfadf05b8e1' into style
updated menu & nav shading on active page & links to proper page
fixed title and cmunities
fixed title and cmunities
Merge branch 'style' into sean
bundle
Added more association definitions to models
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock