base files for phantonjs test
Merge branch 'feature/test' into develop

Conflicts:
	package.json
Merge branch 'develop'
test skeleton using mocha and phantomjs
testing css media queries
makefile compiles css only if sass is newer
mocha tests with phantomjs
Merge branch 'master' of github.com:thomd/js-media-query

Conflicts:
	mediaquery.js