Bundler new
Merge branch 'master' of github.com:bryanmikaelian/asari

Conflicts:
	.gitignore