Merge pull request #11 from stuycs-ml7-projects/master

update
Merge branch 'master' into steven
updated methods
added currentUser
fixed bugs
all working?