update
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
merge conflicts
merged files
added links
Merge pull request #35 from ydarbleoj/create_links

Create links