Merge branch 'release/0.9.0' into dev
Merge branch 'master' into dev
diffmerge says the files are identical. what gives?
Merge branch 'master' into dev
Merge branch 'master' into dev

Conflicts:
	README.markdown
Merge branch 'master' into dev

Conflicts:
	README.markdown
Merge branch 'master' into dev
Added #!/bin/bash

Adding the sha-bang line makes the script executable without
having to prepend "./" to the file name.

modified:   build.sh
Merge branch 'dev'