Fix conflict errors
Update flipcard
Merge remote-tracking branch 'bywave/master'

Conflicts:
	_includes/header.html
	_includes/scripts.html
	_sass/_flipcards.scss
	_sass/_navbar.scss
	index.html
	js/app.js