new branch
merge conflicts fixed
fix merge flixx again
Merge pull request #52 from Cynaria/sassy

there might be a weird AJAX remote in comment form