Update the whole repository @ 2014-06-25 09:33:15 (Taipei Time) :pig_nose:
Merge branch 'master' of github.com:JuanitoFatas/Guides

Conflicts:
	README.md