Delete .DS_Store
Merge branch 'master' of https://github.com/travisreed-wf/SE319
Merge branch 'master' of https://github.com/travisreed-wf/SE319

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/travisreed-wf/SE319
Merge pull request #1 from travisreed-wf/master

mergin changes
Merge branch 'master' of https://github.com/travisreed-wf/SE319
Mergining front end changes and added browse stuff
Merge branch 'master' of https://github.com/travisreed-wf/SE319
Merge pull request #4 from AJH693/master

Browse