first commit
Welcome message added
test commit from eclipse. c
Just a test commit
Another test
Commit AND Push
Adding Matthew's Song Kick source v0.01
Commit AND Push
Merge branch 'master' of ssh://git@git.ucd.ie/androidapp/ticket_fairy.git
another non-fast forward error encountered
removing all song kick files - investigating import of android project
no change here
Attempt to upload song kick source (part of ticket fairy)
@author Matthew
removing redundant songkick branch
:: File removal
:: Branch to follow

See song_kick_api for full sync
Merge branch 'master' of
ssh://git@git.ucd.ie/androidapp/ticket_fairy.git

Conflicts:
	README
removing redundant songkick branch
:: File removal
:: Branch to follow

See song_kick_api for full sync
Merge branch 'master' of ssh://git@git.ucd.ie/androidapp/ticket_fairy.git
full sync of song kick completed
Merge branch 'song_kick_api' of ssh://git@git.ucd.ie/androidapp/ticket_fairy.git into song_kick_api
Adding README files