ignore
added initial news feed list
bulan
bb
jj
fix scroll i menu bar
Merge branch 'jonas' into develop
values in news feed

fills news view with json data from txt file
class
Merge branch 'facebook' of https://github.com/jonasberglund/skrubb_DAT255 into facebook

Conflicts:
	H-sektionen/gen/se/chalmers/h_sektionen/R.java
fix
fix
Merge branch 'facebook' into develop

Conflicts:
	H-sektionen/gen/se/chalmers/h_sektionen/R.java
Implementing Events

Works getting events from Google
updated news feed

added additional info to each post

post now contains message, date and image (image not working yet)
instead of just message
r

R.java? Commit or not?
Merge branch 'facebook' of https://github.com/jonasberglund/skrubb_DAT255 into facebook

Conflicts:
	H-sektionen/gen/se/chalmers/h_sektionen/R.java
added board members
merged develop into info branch
Bilder visas nu i feeden från internet dock läser den fortfarande texten från fil.