Post.java didn't commit last time for some reason

- Shouldve been commited yesterday but didnt for some reason..
Merge

- Solve Post.java conflict