file uploading, image downloading, discusssion tweaks
fixed merging
no really I fixed the merging
Merge branch 'master' of https://github.com/Vadskye/cs294-project

Conflicts:
	Resources/methods.tex