TestUser02 1521
Merge branch 'master' of https://github.com/ViggyPop/Hello_Git_20140120

Conflicts:
	Hello.js