Update
Merge branch 'master' of https://github.com/Avnerus/avnerus.github.io

Conflicts:
	assets/brain/bg.jpg
	css/portfolio.css
	index.html
	js/brain_controller.js
	js/bundle.js
	js/index.js
	js/video_controller.js