testing out a branch merge
Merge branch 'newfix' of github.com:m477h3w1012/CyniChat into newfix
more local branch fixing
fixed UserDetails from git being derpy
Merge branch 'newfix' into nextfix
Merge branch 'nextfix' into newfix
Finally fixed the MySQLManager again...
At long bloody last... if this goes badly now, I swear I will murder git. Merging the current MySQLManager in