Media Page Functional
Merge branch 'master' of https://github.com/tatalala/Thirsty

Conflicts:
	js/script.js
	media.html