stuff on server
merge
Merge branch 'master' of https://github.com/crosscliq/cards
something
merging
Merge branch 'master' of https://github.com/crosscliq/cards
everything on cards