updates
correcting overwrites
Bad merge! Merge go away!
Merge branch 'master' of github.com:mikekvintus/aha
updating project file and removing constraints from legalese