added the about page
changed the git ignore hopefully >.>
fixing merge conflicts