lousy commit
Merge with master
Update Alex
small changes
Fixed conflicts in AndroidManifest.xml
Update
Update new separated list
Added some exception handling
Merge branch 'master' into database
Fix merge Alex
Merge remote-tracking branch 'origin/master'
Changes to database and begun creating other stuff
working stage
wroking stage
Updated database
Merge remote-tracking branch 'origin/master'
Finalized version of database: v1.0
Updated database with exceptions and continued work with presenters
fixed a more generic progress spinner
commiting to be able to merge