fixed conflicts (LOL merge -s ours; push -f)
Merge branch 'master' of https://github.com/Brainshots/triviapsu