add dev file
master file
before merge
Merge branch 'development'

Conflicts:
	.idea/workspace.xml
added test.rb
modify dev.rb.
Merge branch 'development'
what the fuck.
merge test to ms