Weird.
Changed readme
Merge branch 'master' of https://github.com/tehalexf/res-ex

Conflicts:
	README
	README.md
	css/bootstrap.css
	css/style.css
	index.php
	js/bootstrap.min.js
	login.php