setting up sauce connection
resolved merge conflict .travis.yml
merge develop into feature/tests
Added undo view tests
Merge branch 'develop' into feature/tests
Merge branch 'feature/tests' of github.com:Derkje-J/programming-life into feature/tests
Merge branch 'feature/tests' of github.com:Derkje-J/programming-life into feature/tests
added module popover viewtests
Finished undo tests and added modal tests
added more tests
Merge branch 'feature/tests' of https://github.com/Derkje-J/programming-life into feature/tests
edited tests
Added tests for ConfirmModal, LoadModal and Pane
Merge branch 'feature/tests' of github.com:Derkje-J/programming-life into feature/tests
Added view base class test
Added teardowns for module base view class
Merge branch 'feature/tests' of github.com:Derkje-J/programming-life into feature/tests
started modal settings test
Merge branch 'feature/tests' of https://github.com/Derkje-J/programming-life into feature/tests
Merge branch 'feature/tests' of github.com:Derkje-J/programming-life into feature/tests