casd
Merge pull request #1 from DiegoMPerez/master

casd
Merge pull request #2 from DiegoMPerez/master

uuuu
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php
Merge origin/master

Conflicts:
	css/form.css
	css/main.css
	css/screen.css
	index.php
	protected/config/main.php
	protected/views/layouts/column1.php
	protected/views/layouts/column2.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/error.php
	protected/views/site/index.php
	protected/views/site/login.php
	protected/views/site/pages/about.php