Initial commit
Changed README.md to fix conflict.
Merge branch 'gh-pages'
Updated BASE_PATH in config