ec2
Merge branch 'develop' of https://github.com/Juanacv/bitstarter into develop

Conflicts:
	index.html