Merge branch 'master' of https://github.com/nananananate/CourseCake

docs/README.md

@@ -1,5 +1,9 @@
 [![CourseCake](https://github.com/nananananate/CourseCake/blob/master/docs/images/coursecake_header.png?raw=true)](https://docs.coursecake.tisuela.com/)
+<<<<<<< HEAD
 [![Build Status](https://travis-ci.com/nananananate/CourseCake.svg?branch=master)](https://travis-ci.com/nananananate/CourseCake) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/e8ce080e567747998a0efd337069b1ed)](https://www.codacy.com/manual/nananananate/CourseCake?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nananananate/CourseCake&amp;utm_campaign=Badge_Grade) [![Coverage Status](https://coveralls.io/repos/github/nananananate/CourseCake/badge.svg?branch=master)](https://coveralls.io/github/nananananate/CourseCake?branch=master)  [![Website coursecake.tisuela.com](https://img.shields.io/website?label=Web%20API&up_color=success&up_message=up&url=https%3A%2F%2Fcoursecake.tisuela.com)](https://coursecake.tisuela.com/) ![last commit](https://img.shields.io/github/last-commit/nananananate/CourseCake) ![commits activity](https://img.shields.io/github/commit-activity/m/nananananate/CourseCake)
+=======
+![Build](https://github.com/nananananate/CourseCake/workflows/Python%20application/badge.svg) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/99a0203ef24c4675aebaaad2f0167311)](https://www.codacy.com/gh/nananananate/CourseCake/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nananananate/CourseCake&amp;utm_campaign=Badge_Grade) [![Coverage Status](https://coveralls.io/repos/github/nananananate/CourseCake/badge.svg?branch=master)](https://coveralls.io/github/nananananate/CourseCake?branch=master)  [![Website coursecake.tisuela.com](https://img.shields.io/website?label=Web%20API&up_color=success&up_message=up&url=https%3A%2F%2Fcoursecake.tisuela.com)](https://coursecake.tisuela.com/) ![last commit](https://img.shields.io/github/last-commit/nananananate/CourseCake) ![commits activity](https://img.shields.io/github/commit-activity/m/nananananate/CourseCake)
+>>>>>>> a44a39c2a52cd7d6ec213fde6a3643bf6838b051
 
 There are three main features CourseCake offers that make university course information more "edible" for developers: