Merge branch 'master' of /Users/DavinMac/RubymineProjects/yagnob-worked with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/development.sqlite3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
ФЫ