added a back button
removed bin folder
added a .gitignore file
merge conflicts
fixed all merge conflicts and removed other stuff