Deleting unnecessary line
Merge conflict
Merge branch 'master' of github.com:sam-blake/picklsong
Merge branch 'master' of github.com:sam-blake/picklsong
Merge branch 'clean_up' of github.com:sam-blake/picklsong into clean_up
Created welcome popup
In progress: Pop up for signup/login