Test
from phpstorm
from phpstorm
from droid
from droid again
bringing back testing
merged master into testing
Merge branch 'testing' of https://github.com/protopropanol/Hello-World into testing

Conflicts:
	index.html
Merge branch 'testing'