reset
Merge branch 'master' of https://github.com/dillonbhola/COMP3550Project
minor fixes
tweets on the main page
fixes
fixing conflicts
merged with colleen's branch
back-end begins
changes
merge
finished merge with colleen
home page
attemting to authenticate login
home pg edit
Merge branch 'dillon' of https://github.com/dillonbhola/COMP3550Project into colleen
home page
log in
update