routs
Merge branch 'master' of https://github.com/AndyLc/JYC
merge
Merge branch 'master' of https://github.com/AndyLc/JYC
suyog's attempts
Merge branch 'master' of https://github.com/AndyLc/JYC
asd
suyog made contact page
Merge branch 'master' of https://github.com/AndyLc/JYC

Conflicts:
	app/views/static_pages/home.html.erb
suyog's work