profile and edit account
master merged
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
teacher css
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
help update
Merge branch 'developer' of https://github.com/yenbryan/group-project-base into chuck
Merge pull request #32 from yenbryan/adamdev

Adam
question and help
fix merge
Merge pull request #34 from yenbryan/chuckdev

Chuckdev
local
local base merge fix