add.erl
Merge branch 'master' of https://github.com/anna-feliz/OSMP

Conflicts:
	miniProject/src/add.erl
-