local changes before I found merge :)
pull request merged for post controller
work from yesterday
fixed merged conflicts
merge conflicts
csrf addition
merge conflicts with ryans pull
fixing conflicts