first commit gae-boilerplate
Initial commit
Merge branch 'master' of https://github.com/jbruck/biomedicalinnovator

Conflicts:
	README.md
mucking around with LICENSE
Merge remote-tracking branch 'origin/master'