Added root files to solution
bugfix1 added
Sorry, solution change for bugfix1
Merged bugfix1 into master