gemfile lock
gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite
mergeconflict Gemfilelock
error fixes