different direction.

This was abandoned and scraped
Merge branch 'master' of https://github.com/NathanTheGr8/PersonalWebPage

Conflicts:
	.idea/workspace.xml
	Pictures/favicon.ico
	css/bootstrap.css
	css/bootstrap.min.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	less/mixins.less
	less/variables.less