Committing Locally 21st May 2013
Gitting remotely
Merge remote-tracking branch 'choose_remote_name/master'