Initial Commit!
Merging to Angular 1.2.0
Added 1.2.0 to repo
ok
ok
Done
Merge branch 'master' of github.com:j-martin/j-martin.github.io

Conflicts:
	README.md
	css/bootstrap-theme.css
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.min.css
	css/more.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	img/about/portrait.jpg
	img/logo.png
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/controllers.js
	js/jquery.lazyload.min.js
	pages/about.html
	pages/home.html
	pages/photo.html
	pages/render.html
ok