stating slug work
sluged
slugged and routed
bio favacon
Merge branch 'Styling' of github.com:TIYA-Durham-GDI/GDI-rails-4 into Styling
Merge branch 'Styling' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	db/schema.rb
profile favacon linked
Merge branch 'Styling' of github.com:TIYA-Durham-GDI/GDI-rails-4 into Styling
locations show merged styling needed
seeded lat long state and location
incorperating master
instructor tag bug fixed
bug fixed
p tag
Merge branch 'Styling' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	db/schema.rb
Merge branch 'Styling'