Dunno git told me to commit to merge
Merge branch 'master' of https://github.com/cazman/twitterAnalysis

Composer.lock differ between versions, needs to merge
Log in page now gone, only sign in / log in page left because now we log in with twitter