#40 fail to db:migrate
Make email config more fexible

fixes #39
Modified miss
Merge pull request #41 from comutt/more_flexible_email_config

メール設定をより柔軟に
Fixed error on posting new article
Merge pull request #44 from comutt/fix_new_article_error

Fixed error on posting new article
Add .travis.yml
Add script in .travis.yml
Fixed bug.
Add yml file for travis-ci
Execute rspec on travis-ci
Merge pull request #46 from yasuhiroki/travis-ci

Travis CI
Merge pull request #42 from kakusuke/fix-migration

db:migrateに失敗
・update_historiesに於けるuser_idのnot null制約を解除。
・schema.rbを最新化
Revert "・共同編集機能実装。"

This reverts commit 02e346dc1d1e3b9fbea4825a9eb13edd32e4b6c1.

Conflicts:
	app/controllers/articles_controller.rb
	db/migrate/20140628151137_add_user_id_to_update_histories.rb
	db/schema.rb
fix rails spec helper
add simple model tests