SPRINT2 TAPOS NAAA

This is what we have presented for sprint2 =D