Merge pull request #12 from ellenortiz/master

Update/Fix code structure
Merge pull request #13 from ellenortiz/master

Remove site folder
Update _config.yml
Fix conflict errors
Update flipcard
Merge pull request #14 from ellenortiz/master

Add transitions in home section.
Merge remote-tracking branch 'bywave/master'

Conflicts:
	_includes/header.html
	_includes/scripts.html
	_sass/_flipcards.scss
	_sass/_navbar.scss
	index.html
	js/app.js
Fix and merge errors
Fix navigation bar animation
Update Typography
Merge remote-tracking branch 'leo/master'
Add Slider in about sectio