added aaron's requirement sketch
Add merge conflict line
conflict
Merge pull request #3 from xysmas/psromero6

Merge pull request #2 from xysmas/master
Merge branch 'aaron_duties'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/xysmas/lamegame

Conflicts:
	README.md