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
Veda - welcome page buttons linked to appropriate pages
-forms Stephany
Merge branch 'style' of https://github.com/stevemcquaid/cmunity into style
Merge branch 'style'
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
STEPHANY SAVES THE DAY!
schema
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	db/schema.rb
Basic permissions, added some scopes and methods to models to help simplify permission process