Home 16-09-2014
Merge branch 'master' of https://github.com/vcalderon-gb/Makae

Conflicts:
	MockUp/assets/css/makae.css