removed placeholder text from delete
Story title EditText now only one-line
#67 Resolved all warnings, excluded test project from main project
Merge pull request #193 from klindenbach/67-Warnings

#67 Resolved all warnings, excluded test project from main project
Merge pull request #190 from klindenbach/oneline

Story title EditText now only one-line
Merge pull request #189 from klindenbach/master

removed placeholder text from delete
Prevented RANDOM from appearing when you have less than 2 pre-existing chocies
Merge pull request #195 from jcadek/master

Prevented RANDOM from appearing when you have less than 2 pre-existing choices
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 194-UI-XML

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java