my first commit
added rails_12factor
merge changes