fixed a sidebar issue
Merge branch 'dev1.1' into beta
Merge branch 'dev1.1' into development
Update README.md
Update README.md
Added license
Added license
fixed merge issues
Added missing files that the merge tool never added.
deleted files to make room.
Added all missing files. For some reason I could not merge them in.
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework.git into beta
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework.git
into beta
changes?
added doc
Merge branch 'development' into beta
Merge branch 'dev1.2' into development
Merge branch 'development' into beta
fixed this branch, There were files missing from dev 1.2
added files?