Added player sprites and jump hieght
Adding rest of last commit
resolved conflicts