Updating repo with latest that is on do server
Merge branch 'master' of https://github.com/AndrewZurn/andrewzurn-site

Conflicts:
	css/bootstrap.css
	css/bootstrap.min.css
	css/grayscale.css
	font-awesome/css/font-awesome.css
	font-awesome/css/font-awesome.min.css
	font-awesome/fonts/FontAwesome.otf
	font-awesome/fonts/fontawesome-webfont.eot
	font-awesome/fonts/fontawesome-webfont.svg
	font-awesome/fonts/fontawesome-webfont.ttf
	font-awesome/fonts/fontawesome-webfont.woff
	font-awesome/less/bordered-pulled.less
	font-awesome/less/core.less
	font-awesome/less/fixed-width.less
	font-awesome/less/font-awesome.less
	font-awesome/less/icons.less
	font-awesome/less/larger.less
	font-awesome/less/list.less
	font-awesome/less/mixins.less
	font-awesome/less/path.less
	font-awesome/less/rotated-flipped.less
	font-awesome/less/spinning.less
	font-awesome/less/stacked.less
	font-awesome/less/variables.less
	font-awesome/scss/_bordered-pulled.scss
	font-awesome/scss/_core.scss
	font-awesome/scss/_fixed-width.scss
	font-awesome/scss/_icons.scss
	font-awesome/scss/_larger.scss
	font-awesome/scss/_list.scss
	font-awesome/scss/_mixins.scss
	font-awesome/scss/_path.scss
	font-awesome/scss/_rotated-flipped.scss
	font-awesome/scss/_spinning.scss
	font-awesome/scss/_stacked.scss
	font-awesome/scss/_variables.scss
	font-awesome/scss/font-awesome.scss
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	hipaa/grayscale.js
	hipaa/grayscale.min.js
	hipaa/hipaastyle.css
	hipaa/index.html
	hipaa/mystyle.css
	img/appstore.png
	img/bouncinballslogo.png
	img/bridge2.jpg
	img/hipaa.png
	img/hipaa_download.jpg
	img/hipaa_intro.jpg
	img/hipaa_on_iphone.png
	img/keyboard.jpg
	img/playstore.png
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/grayscale.js
	js/jquery-1.10.2.js
	less/grayscale.less