confilct
Merge branch 'master' of https://github.com/tiny-dev/Back-To-The-Wild

Conflicts:
	css/style.css
	index.php