Edit from the local machine but there are changes online!
Merge branch 'master' of https://github.com/rickypmusic/js

Conflicts:
	hello.txt