added image to new profile
edit profile, profiledetails, result page
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayNLearn/bin/classes/com/example/playnlearn/R$string.class
	PlayNLearn/bin/classes/com/example/playnlearn/R$style.class
	PlayNLearn/gen/com/example/playnlearn/R.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayNLearn/gen/com/example/playnlearn/R.java