Added Answer, Question, Reply and User classes
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/src/cs/ualberta/octoaskt12/Answer.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Question.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Reply.java
Edited Answer, Question, Reply classes
fixed merge conflict
Merge pull request #15 from ibarreto/master

Added adapters and solved conflicts
Merge pull request #16 from ibarreto/master

more pair programming Ivan and Aaron, added another adapter and layouts....
added a login activity
Added a UserArrayList
added documentation to Question, QuestionArrayList, QuestionsController, Reply and User classes
Added chris' octoask launcher icon
Merge pull request #17 from ibarreto/master

implemented serializable in some classes
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/AndroidManifest.xml
	OctoAskT12/bin/AndroidManifest.xml
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
	OctoAskT12/res/values/strings.xml
	OctoAskT12/src/cs/ualberta/octoaskt12/Answer.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Question.java
	OctoAskT12/src/cs/ualberta/octoaskt12/Reply.java
	OctoAskT12/src/cs/ualberta/octoaskt12/User.java
Merge pull request #18 from nkparikh/master

Added login activity
made some changes to layout
modified layout, looking nicer