changed way of populating ArrayList from dumb data to objects
Merge remote-tracking branch 'origin/master'