...
...
Merge branch 'v1.0.1' of https://github.com/lcqgrey/NewsApp

Conflicts:
	.DS_Store