init
add active_admin
activities
adding people
rspec and capybara
Merge branch 'master' of github.com:maysam/marjan

Conflicts:
	.gitignore