Added unicorn to gemfile. Updated .gitignore
Merge branch 'master' into 14_add_unicorn_as_app_server

Conflicts:
	.gitignore
	Gemfile
Merge pull request #14 from asoesilo/14_add_unicorn_as_app_server

Add Unicorn as app server