Added basic build configuration
Merge branch 'master' of https://github.com/isolutions/taxi-markup.git

Conflicts:
	src/css/global.css
merge
add global.css