Squashed commit of the following:

commit 4bedaf9db59314d76be548b4eb4139a8578d2f3f
Author: Lloyd Shove <Email@lloydshove.com>
Date:   Thu Apr 25 08:32:00 2013 +0800

    adding feature 2 to file 5

commit fa6fc98a5cf27f3a125624187131e9778faf019f
Author: Lloyd Shove <Email@lloydshove.com>
Date:   Thu Apr 25 08:31:24 2013 +0800

    adding file 5