commit on 01/14/14
Merge branch 'master' of https://github.com/ppamidi/VFA

Conflicts:
	README.md