Create pull-request test file
untracked folders
Merge branch 'master' of https://github.com/hapaman/bloc-jams into pull-request
making changes to landing page
adding untracked files
Merge branch 'pull-request'

Conflicts:
	public/javascripts/app.js
	public/javascripts/app.js.map
	public/stylesheets/app.css
	public/stylesheets/app.css.map