Tried to reset the current working branch
Merge branch 'master' of https://github.com/iordan93/house-arryn-blog

Conflicts:
	HouseArrynBlog.v12.suo