Accidently re-initilized repository
Merge remote-tracking branch 'upstream/master'