added bootstrap, made layout file
Merge branch 'master' of https://github.com/jonbuckley33/Hanashi

Conflicts:
	.idea/workspace.xml