User Login
landing page with login
adding Capistrano
Merge branch 'master' of github.com:mustafa-zidan/octo

Conflicts:
	.gitignore