Finished framework implementation
Merge branch 'master' of github.com:Ezphares/giraf_database