init module
init module
group1-4 Auth model
init module
init module
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
init module
init module
Merge remote-tracking branch 'origin/soc-16' into group1-5
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml
init module
Merge pull request #17 from HelloWorld-PHPJunior/group1-4

UserAuth
Merge branch 'master' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
rename user controller to auth
fix auth view folder name
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout