init
Merge branch 'master' of github.com:colinurbs/newsflash