committing after github went down
Merge branch 'master' of https://github.com/giovannic/hack13

Conflicts:
	style/style.css
Merge branch 'master' of https://github.com/giovannic/hack13
Merge branch 'master' of https://github.com/giovannic/hack13
Merge branch 'master' of https://github.com/giovannic/hack13
added stuff I put together away from repo whil github was down