Added file to git ignore file.
Merge branch 'filling-in-layout'

Conflicts:
	.idea/workspace.xml
Resolving branch issues