update
Merge branch 'master' of https://github.com/joeonmars/grace-portfolio
update;
Merge branch 'master' of https://github.com/joeonmars/grace-portfolio

Conflicts:
	public/assets/static/css/main.css
	source/development/scss/_global.scss
updated with 3d effects;