stufffff
Probably removed the conflictz
Insanity
Merge remote-tracking branch 'upstream/master' into vb653
Fixed Lines going underneath upload button, and more bugs
Merge remote-tracking branch 'upstream/master' into vb653
Merge pull request #683 from balabhv/vb653

Fixed lines going under upload button