first commit
test
remove
classsoa
test
Merge https://github.com/SOA2013-102078507/classSOA
Initial commit
test
Merge https://github.com/SOA2013-102078507/Test
test

Merge https://github.com/SOA2013-102078507/test

Conflicts:
	README.md