Initial push
Merge remote-tracking branch 'origin/master'

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

Initial Push