changes
Merge branch 'dev1.2' into development
changes to the git ignore
changes
Merge branch 'dev1.2' into beta
changes
Merge branch 'beta'
Update README.md
Update README.md
Update README.md
merged and fixed conflict issues
Merge branch 'development' of https://github.com/AdamKyle/Aisis-Framework into development
merged developmet and fixed conflicts
Merge branch 'beta'
merged beta and fixed conflicts
Added
removed
fixed missing files
Added files that were missing
added