TEST
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #1 from RyanJung/master

TEST