Merge pull request #1 from karatemaccie/master

Added .gitignore
Few edits
Merge pull request #2 from karatemaccie/personal

Personal