Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Cornell
2015-09-24 16:14:50 -04:00

View File

@@ -232,6 +232,7 @@ of the project:
1 krischer
1 m.kuehn
1 Adrien Brault
1 Michael Cornell
```
## Credits
@@ -244,7 +245,7 @@ This theme is highly inspired by the following themes:
## License
The MIT License (MIT)
Copyright (c) 2014 [Caio Gondim](http://caiogondim.com)
Copyright (c) 2014-2015 [Caio Gondim](http://caiogondim.com)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal