Allow specifying alpha on colors.
Merge branch 'master' of https://github.com/JonasNorling/nowplot

Conflicts:
	graph.py