Unnecessery whitespace
Merge branch 'master' of github.com:JvG94/crossinghippos
Fix merge conflict
Merge branch 'master' of github.com:babsgosgens/crossinghippos
Created default templates
Merge branch 'master' of github.com:jeantje/crossinghippos
Added simple background colors for definition
Merge branch 'master' of github.com:jeantje/crossinghippos
Fixed display of date
added styling files
Merge branch 'master' of github.com:jeantje/crossinghippos
Created dribbble model
Created base template for dribbble stream
Made date in the good format
Merge branch 'master' of github.com:jeantje/crossinghippos
Optimized dribble stream
Renamed file
Introduced Google PHP API
Added functions to twitter stream
Created Flickr API