2014092501 commit from cmd
t
q
qqqquuu`Merge branch 'master' of https://github.com/martinverdejo/hello

Conflicts:
	.gitignore