Version 0.05 - August 2013

1. Resolved conflict.