Merge branch 'dev' into 624_N
qwe
Merge branch 'dev' into 624_N
qwe
Merge branch 'dev' into 624_N
add links
fix controller and links
add links
fix conflict
Merge branch 'dev' into homepage_new
Update development.yml.example
Merge remote-tracking branch 'origin/dev' into dev
Merge pull request #16 from is-valid/homepage_new

add links
add category
Merge branch 'dev' into 624_N
Merge pull request #17 from is-valid/624_N

624 n
add model category
Merge pull request #18 from is-valid/624_N

add model category
templates for post-index and post-show + partials added
Modified index post and home files - leave my changes