test commit
Merge branch 'vlad'

Conflicts:
	include/css/styles.css
	include/js/myscripts.js
	index.php