README
Updated the README.md file to be a little more informative
README
Commit specifically to demonstrate what a merge conflict looks like
README
Added a new feature to this file the better way. This is branched off the PR-1 Branch that I previously made.
DOCUMENTATION
Added documentation to this module
DOCUMENTATION
Added some documentation to this file
Merge pull request #7 from gsbullmer/gh-pages

Visual Update
Merge branch 'PR-1' of https://github.com/adambullmer/doa2-team-generator into adambullmer-PR-1
Merge branch 'adambullmer-PR-1'
Merge pull request #4 from adambullmer/PR-1.5

PR-1.5 Look at me first!
Merge branch 'PR-conflict' of https://github.com/adambullmer/doa2-team-generator into adambullmer-PR-conflict

Conflicts:
	README.md
Merge branch 'master' of https://github.com/gsbullmer/doa2-team-generator into adambullmer-PR-conflict

Conflicts:
	README.md
Merge branch 'adambullmer-PR-conflict'
Merge pull request #5 from adambullmer/PR-4

Another Basic Commit
Merge pull request #6 from adambullmer/PR-5

PR-5