version1.0 test app
test for sample_app_2
07-06 create questionnaires and qrcode
2014-07-07  version1.0
update database
answer questions and show my questions
q
^&^XMerge branch 'v1.0' of github.com:SoftwareFireFlies/Questionnaire_FireFly into afternoon

Conflicts:
	app/views/questionnaires/show.html.erb
	db/development.sqlite3
	db/schema.rb
Release version2.0  2014-07-07
release version2.0
release version2.0
update Gemfile
release version2.0
Gemfile
v2.1 afternoon
john lee 20140708 evening
version3.0 20140710
什么都没发生
test
Merge branch 'master' of github.com:xuchong/helloworld

Conflicts:
	.gitignore