Added some cosmetic changes
Added tasks #1-2
Added solution for task #2
Added solution for task #1, some cosmetic changes to task #2 solution