[from now] 2013/11/13 04:33:05

diff --git a/public/json/swears.json b/public/json/swears.json
index 8a66b0e..76cdcaa 100755
--- a/public/json/swears.json
+++ b/public/json/swears.json
@@ -3,7 +3,6 @@

 {"swear":"bastard","censoredSwear":"ba**t**d", "offensive":"false"},
 {"swear":"bitch","censoredSwear":"bi**h", "offensive":"false"},
-{"swear":"bitchtits","censoredSwear":"bi**ht**s", "offensive":"false"},
 {"swear":"bullshit","censoredSwear":"bu**sh**", "offensive":"false"},
 {"swear":"bitchslap","censoredSwear":"b****s**p", "offensive":"false"},

@@ -25,13 +24,13 @@

 {"swear":"nigger","censoredSwear":"ni**er", "offensive":"true"},
 {"swear":"niglet","censoredSwear":"ni**et", "offensive":"true"},
-{"swear":"nigga","censoredSwear":"ni**a", "offensive":"true"}, //this shit only offensive if you aren't black, my nigga//
+{"swear":"nigga","censoredSwear":"ni**a", "offensive":"false"},

 {"swear":"retard","censoredSwear":"r*t**d", "offensive":"true"},
 {"swear":"retarded","censoredSwear":"r*t***ed", "offensive":"true"},

 {"swear":"shit","censoredSwear":"sh**", "offensive":"false"},
-{"swear":"shitlord","censoredSwear":"sh**lo**", "offensive":"false"},
+{"swear":"shitlord","censoredSwear":"sh**lord", "offensive":"false"},
 {"swear":"shithead","censoredSwear":"s***he**", "offensive":"false"},
 {"swear":"slut","censoredSwear":"sl**", "offensive":"true"},

@@ -42,14 +41,14 @@

 //New Swears - November 12//

-{"swear":"assfuck","censoredSwear":"a**fu**", "offensive":"false"},
-{"swear":"asshole","censoredSwear":"ass**le", "offensive":"true"},
+{"swear":"assfuck","censoredSwear":"a**fu**", "offensive":"true"},
+{"swear":"asshole","censoredSwear":"ass**le", "offensive":"false"},

 {"swear":"fag","censoredSwear":"f*g", "offensive":"true"},
-{"swear":"faggot","censoredSwear":"f*gg*t", "offensive":"true"},
+{"swear":"faggot","censoredSwear":"f*gg*t", "offensive":"false"}, //Can also be a word for a bundle of sticks, not offensive.

 {"swear":"cocksocket","censoredSwear":"co*k*so**et", "offensive":"true"},
-{"swear":"cockasaurus","censoredSwear":"co*k**au**s", "offensive":"false"},
+{"swear":"cockasaurus","censoredSwear":"co*k**au**s", "offensive":"true"},

 //British Words//
Merge branch 'master' of https://github.com/JFKingsley/CussCha

othing, eh
Partial fix for captcha.php, only works if settings vars are specified in file and if misspelled words is on, needs patch to restore full functionality
Edited swears
Added settings page and swapped out to JSON based settings
Fixed all teh stuffs, Thanks for breaking everything Flakez..
Merge branch 'master' of https://github.com/JFKingsley/CussCha
Upstream updates
Restored pre-upstream merge updates, formatting, and new visualised settings page
Updated to do list.