Reverting to an old state
Merge branch 'test' into develop
Reverted the index.html according to the instructions in the HW
Merge branch 'develop' of github.com:catalinciurea/bitstarter into develop

Conflicts:
	index.html