# Conflicts:
#	resources/views/layouts/app.blade.php

# Conflicts:
#	resources/views/layouts/app.blade.php

# Conflicts:
#	resources/views/post/newsfeed.blade.php

* develop:
  well style
  clean
  edit image post style
  ok
  delete like page

# Conflicts:
#	resources/views/post/newsfeed.blade.php

# By Nitipat
# Via Nitipat
* feature/ui_clean:
  max width
  center feed

Conflicts:
	resources/views/post/newsfeed.blade.php

# By Nutchalum (2) and others
# Via Nutchalum (4) and kamonkwun-mbp (2)
* develop:
  like
  comment in newsfeed
  return like
  Fix like
  fix post