Merge pull request #1 from itcc-li/sprint1

Sprint1
Sources for story 2
Merge pull request #2 from itcc-li/sprint2

Sprint2
Merge pull request #3 from itcc-li/sprint2

Sprint2
Merged
merge
commit
Merge branch 'sprint3' into sprint2

Conflicts:
	Hackathon[2014]/gen/.gitignore
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
Merge pull request #16 from stevebo/sprint2

Sprint2
Merge pull request #6 from itcc-li/sprint2

Sprint2
Merge branch 'sprint2' into tmp2

Conflicts:
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java