Startup 2
Merge branch 'master' of https://github.com/dmarco/blumimax

Conflicts:
	.gitignore