travis-ci descriptor added
changed faker option for cyte
Merge pull request #8 from LambdaTeamAtBursa/issue_3

Models of cyte& cyte_categories (also added models for users)
Merge branch 'develop' into issue_6
added ruby version to travis descriptor
Correct ruby version from precompiled on Travis
comment faking with sentence
postgres config for travis
Merge branch 'develop' of github.com:LambdaTeamAtBursa/PositiveLambda into develop

Conflicts:
	.travis.yml
added travis status icon
ignore .idea/ - rubymine folder
added hierarchical structure to comments
Merge branch 'develop' into issue_6
Merge pull request #7 from LambdaTeamAtBursa/issue_6

Model for comments
Merge pull request #9 from LambdaTeamAtBursa/issue_3

Model for comments
trying to create many to many relationship for tags with has_and_belongs_to_many
Merge branch 'develop' into issue_5

Conflicts:
	app/models/cyte.rb
	db/schema.rb
	spec/factories/cytes.rb
	spec/models/cyte_spec.rb
Merge branch 'develop' into issue_5

Conflicts:
	app/models/cyte.rb
	db/schema.rb
	spec/factories/cytes.rb
	spec/models/cyte_spec.rb
tags and cytes
issue 5 (tags)
- added tags
- fixed hierarchical comments
- refactored factories