#16 done, timeline, mypost, posting done
test code removed
Merge branch 'master' of https://github.com/DuckyCho/fineappleServer into YD : conflict removed

Conflicts:
	main.py
Merge branch 'YD'