initial commit
add mysql to gemfile
add ruby version: 1.9.3
Merge branch 'master' of https://github.com/u651601f/aifa

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/database.yml
	config/initializers/secret_token.rb
	vendor/bundle/gems/atomic-1.1.15/ext/Makefile
	vendor/bundle/gems/json-1.8.1/ext/json/ext/generator/Makefile
	vendor/bundle/gems/json-1.8.1/ext/json/ext/generator/generator.bundle
	vendor/bundle/gems/json-1.8.1/ext/json/ext/generator/generator.o
	vendor/bundle/gems/json-1.8.1/ext/json/ext/parser/Makefile
	vendor/bundle/gems/json-1.8.1/lib/json/ext/generator.bundle