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

update
Merge branch 'master' into steven
updated methods
added currentUser
tabs working
tabs working better
fixed bugs
changes
moar changes
all working?
dina merge
Merge branch 'biggs'
Working Copy 2
added home.html
index changed
Merge branch 'steven' into biggs
dasdasd
Merge branch 'master' into dina
page naviagation working
Merge branch 'master' into dina