Merge branch 'develop' into feature/database/migrate
Switched to postgres
Merge branch 'develop' into feature/database/migrate
Merge branch 'feature/database/migrate' into develop
Main view test should now be tested in Sauce
Merge branch 'develop' into feature/tests
Switched Teabag back to PhantomJS and added postgres directives for Travis
Switched Teabag back to PhantomJS and added postgres directives for Travis
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Adds postgres user for app
Merge branch 'develop' into feature/tests
Modified tests to work with new views