update teachers button and page
update teachers button and page
Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/kozalak into develop
#32 add displaying fields to user welcome page
Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/kozalak into develop
#34 user edit page updated
#40 user registration form
#33 #37 Update teacher and sign up forms
Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/kozalak into develop
#33 user sign up, update profile
#20 teacher layout and partials
#20 teacher layout and partials
#20 welcome page buttons
Fixed conflict