commiting changes
combining everyone's files
adding new res files to commit