moving files around this was overwritten
Merge branch 'master' of https://github.com/w00f/chatFe

I moved around files some and now git rejects my commits due to the repository being not alligned (?).