wtf
Merge branch 'master' of https://github.com/Seojiwoong/study

Conflicts:
	forSynap/ipsa/2014
	forSynap/ipsa/ipsa.c