Merge branch 'master' of https://github.com/kyleg0/HorseTinder

Conflicts:
	css/bootstrap.min.css
	css/style.css