Merge branch 'master' of https://github.com/dvera123/amex.git

Conflicts:
	assets/css/main.css
	assets/js/main.js
Merge branch 'master' of https://github.com/dvera123/amex.git