profile and edit account
master merged
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
merge
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
local
teacher css
Merge branch 'developer' of https://github.com/yenbryan/group-project-base
teacher styling
help update
Merge branch 'developer' of https://github.com/yenbryan/group-project-base into chuck
fixed misplaced action button
Merge pull request #29 from yenbryan/peterdev

fixed misplaced action button
Merge pull request #30 from yenbryan/dev-bryan

whoa, lots of file changes
teacher portal finish
merge with developer
Merge pull request #32 from yenbryan/adamdev

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

Chuckdev