.
Merge branch 'master' of https://github.com/ecagiral/modayiyasat.git

Conflicts:
	app/views/Application/index.html
	public/stylesheets/main.css
.
.