v23/03/2013

- Fixed many bugs for testing
- Included shapes.txt in the copied files when compiling