Merge branch 'group1-5' of github.com:HelloWorld-PHPJunior/soc into group1-4
Merge remote-tracking branch 'origin/master' into group1-4
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
rename user controller to auth
fix auth view folder name
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
Merge branches 'Branch' and 'master' of github.com:HelloWorld-PHPJunior/soc into Branch
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
message
message
message
message