Issue #3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge pull request #13 from jessvalarezo/master

Issue #3