Pretty background stacking.
Merge remote-tracking branch 'origin/spyware-words' into spyware-voting
MERGES
Merge origin/master into spyware-voting
Merge remote-tracking branch 'origin/master' into spyware-voting
merged master into spyware-voting
Merge remote-tracking branch 'origin/master' into spyware-voting
removed unnecessary success test
fix merge conflicts
merged from master
Merging master into spyware-voting
Damn... wat a merge
fixed tree
updates
fixed popup
fixed fixed words
merged master to tree stuff
fixed spacing in header