02/12/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	facebook_login.html
Merge branch 'master' of https://github.com/JVRibeiro/jvribeiro.github.io

Conflicts:
	facebook_login.html