educate users
Merge remote-tracking branch 'upstream/master'
fixing URLs to point to github usernames
fixing URL
minor merge issues
merge issues
final merge issue
Merge pull request #35 from fusion94/master

Links to GitHub users