Prepare for midterm
Merge our master branch with the original repository. Prepare the application to be used in the midterm.
Edited by jtimotei
Merge our master branch with the original repository. Prepare the application to be used in the midterm.