merge fiy
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/fetsite/fetsite
merge gemfile.lock
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
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