system and body headers
adding *~ to gitignore
pulling in new files from master branch