temp test
Merge branch 'temp'

Conflicts:
	main.c
chunjie@ubuntu merge