big change
Merge branch 'master' of https://github.com/badboy315/badboy315.github.com

Conflicts:
	.DS_Store
	album/.DS_Store