working on ModelTest
Merge remote-tracking branch 'origin/master'
commting to be able to merge
fixing indexing problem at start screen, made by alex
Merge remote-tracking branch 'origin/master'
commiting to merge
changes
conflicts and fixes
changes
Merge remote-tracking branch 'origin/master'
commiting to merge
Updated message-classes to have safer type checking
a bunch of test stuff
Small change in message class
fixing merge conflicts
Try to fix branched paths
Merge with test class
Fixes to remove any unwanted changes that occured during divergation
Removed unused imports
Moved progressbar classes to view
Updated other classes with references to the progress bars
General update
Class updated with comments