added michelle's static pages for her
Added rails-erd
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock

Temp Stash
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
Merge pull request #21 from stevemcquaid/sean

Sean
commiting forms Stephany
Merge branch 'style' of https://github.com/stevemcquaid/cmunity into style
Veda - guest welcome page and user welcome page styled using Bootstrap
Merge branch 'style' of github.com:stevemcquaid/cmunity into style
Merge branch 'style' of https://github.com/stevemcquaid/cmunity into style
Veda - changed description under "Communities" for logged in user