Alpha 1
Working
One line
Merge branch 'chalenge2'

Conflicts:
	_css/style.css
	_js/script.js
	index.html