Experiments
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Using only the dist directory for jspm
Minification
Merge branch 'dev'

Conflicts:
	dist/script.js
Merge branch 'master' into dev

Conflicts:
	dist/script.js
	package.json
Implemented get / set state methods