Did something..
Merge branch 'master' of https://github.com/hypereddie10/jFlank

Conflicts:
	src/com/ep/jflank/model/feed/FeedItem.java