Merge branch 'master' of github.com:ctanis/libram

Conflicts:
	demo/ramdemo.cpp
Merge branch 'master' of github.com:ctanis/libram