Merge pull request #7 from emrickgarrett/master

new
Merge pull request #33 from brobinson09/master

Merge pull request #7 from emrickgarrett/master
Changes to the WebMethods
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
Register page changes
Merge pull request #34 from caitlinvangundy/master

Register page changes
Added Screenshots
Some small changes, text views in both feed and Calendar are now functional (in theory)
FIXES
Functionality to login screen
Merge pull request #35 from caitlinvangundy/master

FIXES
asdf
Merge pull request #36 from caitlinvangundy/master

asdf
Merge pull request #10 from emrickgarrett/master

asdfadsgasdgasdg
Update
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
asdfasd
Emailing is all working now
Merge pull request #37 from caitlinvangundy/master

egaqq
asdf