add test
edit project
del idea
Merge branch 'dev' into 647

Conflicts:
	Gemfile.lock
one
asd
647 finish
Merge pull request #5 from is-valid/647

647