initial setup, modified Gemfile
Merge branch 'master' of github.com:simicic/baseAppCI

Conflicts:
	.gitignore