fixed bug with collision, moved Player to separate file