updated gitignore
initial angularjs
fixed paths
gitignore
fixed .idea
new html file - artist
method add on artist
angular seed
fixed angular
first controller
ajax controller for artist gets
Nimetty partialit uudestaan ja lisätty news
artist service
artist service
Merge branch 'master' of github.com:futurice/festapp-server

Conflicts:
	.gitignore
	.travis.yml
	package.json
	server.js
new home-page for us
more stuff for the app listing
Merge branch 'master' of github.com:futurice/festapp-server
Testing flowdock integration
Merge branch 'master' of github.com:solmu2/festapp-server

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.