How to contribute updated in readme.
Fixed time format to be "H:i:s".

PHP's date formatter uses "m" for months, so "H:m:s" translates
to hours-months-seconds. The correct format string should be "H:i:s".
Merge pull request #1 from erjiang/master

Fix date formatting - FIRST PULL REQUEST WOO HOO!
Merge branch 'master' of github.com:mattkatz/Wordprss
removing old ember files.

Goodbye!
wiring up logic for import opml

most likely will have to switch this to be more angular.
getting the opml.js
Add comments, TODOS

Just realized we might not be storing the feed_id for new feeds back to
model.
OPML uploading, upgraded angular version

Now OPML uploads by calling save repeatedly from the browser.
The progress bar doesn't seem to do much because it takes place in the
angular loop rather than happening in the background.

eliminated the opml js file and cleaned up the main wordprss file.
ditz
Merge branch 'import-opml' into angular
Merge branch 'angular' into clean-up-ember-files

Conflicts:
	wordprss.php
Removed old ember related files.

Also removed Waypoints - don't really need them for now.
ditz
ditz
Merge branch 'master' into angular_infinite_scroll_dupes
fixing the duplicate entries on infinite scroll

pulled in tcard's addition to ngInfiniteScroll, which allows you to set
containers other than window as the scrollable element.

Underscore's union operator didn't work for the entries. Instead we
search the list each time for a match and insert if we don't find it.
removing some logging