HELLO
Merge branch 'master' of https://github.com/tatalala/Thirsty

Conflicts:
	Media.html