Melissa added her name.
Tried to delete conflicted changes
Merge branch 'master' of https://github.com/mpangilinan/GitWorkshop2013
delete swap
Merge branch 'master' of https://github.com/mpangilinan/GitWorkshop2013
added main()
deleted conflicting changes