I have no idea what I just commited
Merge branch 'master' of github.com:aarjmand/personalpage

Conflicts:
	Gemfile
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/manifest.yml
God knows what I am doing right now